[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into rvc-dev am: f27585e400 am: 9f918b8ffc -s ours
am skip reason: Change-Id I380a973a0cc78f1206fd7a33d0bd4896a0b16c6d with SHA-1 4e63378884 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987681
Change-Id: I1a3cee2e5fa0f64297bdb9aa8f5d9ed5216b4cad
This commit is contained in: