[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into rvc-dev am: f27585e4 -s ours am: b81e6037 -s ours

am skip reason: Change-Id I380a973a0cc78f1206fd7a33d0bd4896a0b16c6d with SHA-1 4e633788 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987681

Change-Id: I21cbe25cc4c286a1b5bd3dd14b5c348727a20a2a