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

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

Change-Id: I6df7e2ea148e9012f95383a63526a1142225b952