Merge "KeyMint AIDL tweaks" am: 07045b7e83 am: 0951649aaf am: 7958c3128f am: 180ffd4bc0

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

Change-Id: I8e922100b492c5d38e1c3ff1cff98973aabb9b5a