Merge "Use latest Identity and KM AIDL API" am: 34565c65fd am: c5d273a92b

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

Change-Id: Id0139b680e3a15545bc88622a1cec6b4c980a444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>