Merge changes from topic "keymint_aidl_impl" am: 34a7139467 am: d224907547 am: 7262a307d2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dad990ab917f97100a07259a13e5bcda5e39d9d