Merge "Depend on Keystore2 AIDL via default" am: c785af9e27

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1906282

Change-Id: I2615c87325d0df9dba94df32da0d982ac065bda9