Merge cherrypicks of [16373492] into sc-qpr1-release. am: 97d6fe61f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/16374489

Change-Id: I33ee42be14e5f4203bc143a15fa18adca5af06dd
diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java
index 2e67b08..e3b8dee 100644
--- a/src/com/android/server/telecom/CreateConnectionProcessor.java
+++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -661,7 +661,7 @@
             }
 
             // then by hashcode
-            return account1.hashCode() - account2.hashCode();
+            return Integer.compare(account1.hashCode(), account2.hashCode());
         });
     }