Merge "Centralise logic for setting credential manager app" am: 353a2c4f am: 6cf93cd8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I866ec597d625668be13d8833c86b6105f66ee742

keystore/java/android/security/IKeyChainService.aidl

@@ -60,7 +60,6 @@ interface IKeyChainService {
     byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem);
     List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem);
     void setCredentialManagementApp(String packageName, in AppUriAuthenticationPolicy policy);
-    void updateCredentialManagementAppPolicy(in AppUriAuthenticationPolicy policy);
     boolean hasCredentialManagementApp();
     String getCredentialManagementAppPackageName();
     AppUriAuthenticationPolicy getCredentialManagementAppPolicy();