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

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

Change-Id: I388758629a0edbe6f1d531df8a974e95b18791c4