Fix manage ISO 15693 and NFC Forum T5T legacy am: 8908bae436

Original change: https://android-review.googlesource.com/c/platform/system/nfc/+/2935790

Change-Id: Ibfe53f19368cc2687c7301c9a1b33d15fa9bb5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>