Merge "Identity: Update for changes to ISO 18013-5." am: 5594199543

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

Change-Id: I02e86eaae1eaae34d48fd03011b60230dad88be4