Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d

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

Change-Id: Id5fc627c5b0e28c44176ee89f4b3d6574a52b81d

keystore/java/android/security/KeyStore2.java

@@ -125,6 +125,8 @@ public class KeyStore2 {
         }
     }
 
+    private static final String KEYSTORE2_SERVICE_NAME =
+            "android.system.keystore2.IKeystoreService/default";
 
     private KeyStore2() {
         mBinder = null;
@@ -137,7 +139,7 @@ public class KeyStore2 {
     private synchronized IKeystoreService getService(boolean retryLookup) {
         if (mBinder == null || retryLookup) {
             mBinder = IKeystoreService.Stub.asInterface(ServiceManager
-                    .getService("android.system.keystore2"));
+                    .getService(KEYSTORE2_SERVICE_NAME));
         }
         return mBinder;
     }