[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into...

[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into rvc-dev am: 494c937d am: c5ab6a92 am: 395370c8 -s ours am: f185b41a -s ours

am skip reason: Change-Id I73fc7eb48ffb71e00a8b54849266ed814295fa39 with SHA-1 2e4533e5 is in history

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

Change-Id: I9118303ffab12f87caf24d2ea30f386ea189cd4b