Merge "Identity Credential changes for Android 12" am: ef90842503

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d784db01bae8fe694902e6c227c471806e2ab7f