Merge "Align KeyMint AIDL with usage" am: 6b8f292b17

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682041

Change-Id: Ifbfee047de1cd0abb68723ede408658286cfae0a