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

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

Change-Id: I49b837ec97c427131c40fe9a4b88d5383cceb65b