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

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

Change-Id: I3d46ef7453a359a739303c95b4076069a3e96b45