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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6012072f2682bcb31c5aead9cb8f01e560a3560