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

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

Change-Id: Ifd9367fb8d381c4a0f1fe2cc354a17df68ab3696