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

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

Change-Id: I47f5b733bfa7d61c4d3bfa5ee89a1abc6bc2243f