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

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

Change-Id: I803cc05da5a1fe22e27db8683632114a322c9b99