[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into rvc-dev am: 494c937d78 -s ours am: 1af059440e -s ours

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

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

Change-Id: I81d2f6d269b0371e0c87dc2ef3315bfc751d8fbd