Wrong icon getting set for an app on secondary user during updates

Bug: 20163841
Change-Id: Ief91db56f7831f89e34c4540981a9d2db96b8bed

src/com/android/launcher3/IconCache.java

@@ -283,8 +283,8 @@ public class IconCache {
             }
             ContentValues values = updateCacheAndGetContentValues(app);
             mIconDb.getWritableDatabase().update(IconDB.TABLE_NAME, values,
-                    IconDB.COLUMN_COMPONENT + " = ?",
-                    new String[] { cn });
+                    IconDB.COLUMN_COMPONENT + " = ? AND " + IconDB.COLUMN_USER + " = ?",
+                    new String[] {cn, Long.toString(userSerial)});
 
             updatedPackages.add(component.getPackageName());
         }