tree 1a8e13748dc17627f979db4e8d3f800e80077b75
parent 0b529456ac0a936b7143ccf4ec646f50ea5723a2
parent b76ecffac17dca0769d701fcbad248177e8dd937
author David Drysdale <drysdale@google.com> 1619545274 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619545274 +0000

Merge "Align KeyMint AIDL with usage" am: f3f465d6a7 am: b76ecffac1

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1679931

Change-Id: If938ce03f02a53b20964bfbbb447c21e9255443a