Merge "Align KeyMint AIDL with usage" am: 5cde787c9f am: 63bd1b149b

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

Change-Id: Iab39fbb7383c15a7dfb5bc30acf67f03643f50ec