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

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

Change-Id: I0712dbb885ffb1abe1a56de5c37b8f919bdfc065