Merge "DO NOT MERGE Uses equals to compare the old/new subtypes." into udc-dev

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

@@ -3263,7 +3263,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
                 notifyInputMethodSubtypeChangedLocked(userId, info, null);
                 return;
             }
-            if (newSubtype != oldSubtype) {
+            if (!newSubtype.equals(oldSubtype)) {
                 setSelectedInputMethodAndSubtypeLocked(info, subtypeId, true);
                 IInputMethodInvoker curMethod = getCurMethodLocked();
                 if (curMethod != null) {