Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218ea am: e5506eb032 am: ad21c990e4

Change-Id: I2ef0bb817a190df4eb48b77020211954750aed66

identity/java/android/security/identity/CredstoreIdentityCredentialStore.java

@@ -38,6 +38,10 @@ class CredstoreIdentityCredentialStore extends IdentityCredentialStore {
         ICredentialStoreFactory storeFactory =
                 ICredentialStoreFactory.Stub.asInterface(
                     ServiceManager.getService("android.security.identity"));
+        if (storeFactory == null) {
+            // This can happen if credstore is not running or not installed.
+            return null;
+        }
 
         ICredentialStore credStore = null;
         try {