Merge "KeyMint AIDL tweaks" am: 07045b7e83 am: 0951649aaf

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

Change-Id: I0f32ef2d43046e70e478d7fdea130d7f354f5bd0