Merge "Align KeyMint AIDL with usage" am: f3f465d6a7 am: b76ecffac1

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1679931

Change-Id: If938ce03f02a53b20964bfbbb447c21e9255443a