Merge "Align KeyMint AIDL with usage" am: f3f465d6a7

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

Change-Id: I7579eeb651793a07540808f3586698d41c4efa2e