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

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

Change-Id: Ibd9d97996806eba36b6691f61d302cf60848a3d5