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

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

Change-Id: I7ee783a56e6c76e8d9e3b52bb52b9e22e80682c6