[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into rvc-dev am: f27585e4 am: 9f918b8f am: c8f2a57a -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: Id2422857928dd2cbb159336329de23f378871046