Merge cherrypicks of ['googleplex-android-review.googlesource.com/23554146'] into sparse-10252186-L42700000961059379.
SPARSE_CHANGE: I2ee30dfa5e4170272b5353f270a69b38750a0bd5

Change-Id: Ibcd59f63194e106161ddecfe0e39db5af5223089
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 72feb7b..bc57f66 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -187,10 +187,10 @@
                 getTitleAndIcon(info, false);
                 return info;
             };
-        } else if (info instanceof PackageItemInfo pii) {
+        } else if (info instanceof PackageItemInfo) {
             task = () -> {
-                getTitleAndIconForApp(pii, false);
-                return pii;
+                getTitleAndIconForApp((PackageItemInfo) info, false);
+                return info;
             };
         } else {
             Log.i(TAG, "Icon update not supported for "