Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I136d349b3f29b924f61d7739ded7616dcaa16c72