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

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

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