Merge branch 'security-aosp-qt-release' into int/10/fp2

* security-aosp-qt-release:
  Fix sorting issue during emergency call attempt.

Change-Id: I35f1d138531d7e0825848d18b906eb1283d7f4d5
diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java
index 6c92724..89200ad 100644
--- a/src/com/android/server/telecom/CreateConnectionProcessor.java
+++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -593,7 +593,7 @@
             }
 
             // then by hashcode
-            return account1.hashCode() - account2.hashCode();
+            return Integer.compare(account1.hashCode(), account2.hashCode());
         });
     }