Merge "KeyMint AIDL tweaks" am: 07045b7e83

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102

Change-Id: If28d092cc322392b118e5b9cf9de968b8432cc80