Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83 am: 190b5fb47a am: 050a7ed6ec

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

Change-Id: I81f9db78a95dfd5f80cb6de897e3b45698fa5ab4