Merge "Identity: Update for changes to ISO 18013-5." am: 84a6118710 am: 6223c5fbf3 am: 6544b9f52c am: cac5d5dbf4 am: 1925f27c6a

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

Change-Id: I33bbe95329c577422ac9aa74387eb72a9386b23b