tree 6a803e25b97b003e027e9b1cd91e0444a18f1d76
parent ccd2d0687c92bbf038de99bd2a3e9e82cab1afd1
parent 190b5fb47a36ce0914e5c99aa19daa16ddb3f392
author Treehugger Robot <treehugger-gerrit@google.com> 1638902878 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638902878 +0000

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

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

Change-Id: I3a986fe14e69b6f94f86962574198d6b3dc358da