Merge "Fixing wrong diffing logic in AdapterItem" into tm-dev am: c2c1fdad54 am: 3960374e68 am: 7f1b08672e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18701868

Change-Id: I1a9793a2f412cc25c483b7d12dad3d0e257f8a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/allapps/BaseAllAppsAdapter.java

@@ -119,7 +119,7 @@ public abstract class BaseAllAppsAdapter<T extends Context & ActivityContext> ex
          * Returns true if the items represent the same object
          */
         public boolean isSameAs(AdapterItem other) {
-            return (other.viewType != viewType) && (other.getClass() == getClass());
+            return (other.viewType == viewType) && (other.getClass() == getClass());
         }
 
         /**