Merge "Identity Credential changes for Android 12" am: ef90842503 am: 409331de91 am: 3b83d41967 am: 0f8e9d1b6e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9222d482d9a18692d18eef543f93ca1ecfcb0ef1