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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bb03549da49cbee335e9e322658eed367b68907