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

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

Change-Id: I0fac9054cf9432bdac30fe3d4b4934b1dae5c61f