Merge changes from topic "keymint_aidl_impl" am: 34a7139467

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a8050d780bc01a27551a99ce74967053bd8cc6f