Revert "Merging ub-launcher3-master, build 5938524"

This reverts commit 7cb721fa81.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I10ebd177cc98be896282147df481b05f28241758

iconloaderlib/src/com/android/launcher3/icons/cache/IconCacheUpdateHandler.java

@@ -171,7 +171,8 @@ public class IconCacheUpdateHandler {
                 long updateTime = c.getLong(indexLastUpdate);
                 int version = c.getInt(indexVersion);
                 T app = componentMap.remove(component);
-                if (version == info.versionCode && updateTime == info.lastUpdateTime
+                if (version == info.versionCode
+                        && updateTime == cachingLogic.getLastUpdatedTime(app, info)
                         && TextUtils.equals(c.getString(systemStateIndex),
                                 mIconCache.getIconSystemState(info.packageName))) {
 
@@ -231,7 +232,6 @@ public class IconCacheUpdateHandler {
         }
     }
 
-
     /**
      * A runnable that updates invalid icons and adds missing icons in the DB for the provided
      * LauncherActivityInfo list. Items are updated/added one at a time, so that the