Merge "Simplify UserHandle.equals" am: fd971bb180 am: 16c257176a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2619455

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

core/java/android/os/UserHandle.java

@@ -597,12 +597,9 @@ public final class UserHandle implements Parcelable {
 
     @Override
     public boolean equals(@Nullable Object obj) {
-        try {
-            if (obj != null) {
-                UserHandle other = (UserHandle)obj;
-                return mHandle == other.mHandle;
-            }
-        } catch (ClassCastException ignore) {
+        if (obj instanceof UserHandle) {
+            UserHandle other = (UserHandle) obj;
+            return mHandle == other.mHandle;
         }
         return false;
     }