Merge "Depend on Keystore2 AIDL via default"