Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f9d4a93709ffe0013e0fadd27d991a75c77605

keystore/java/android/security/IKeyChainService.aidl

@@ -46,6 +46,7 @@ interface IKeyChainService {
     boolean installKeyPair(
         in byte[] privateKey, in byte[] userCert, in byte[] certChain, String alias, int uid);
     boolean removeKeyPair(String alias);
+    boolean containsKeyPair(String alias);
 
     // APIs used by Settings
     boolean deleteCaCertificate(String alias);