Merge "Use latest Keystore2 AIDL API"