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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a92190ab3a4c939288141af7095a2c61a7036ba