Merge "Allow CompOS APEX to access Keystore AIDL." am: fd7eeeaa1d am: 2a77df8a86 am: adb7159de8 am: 631063a5be

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

Change-Id: I17551fdbe27670259f4a9c2947b4bffda687df9d