[automerger skipped] Type confusion due to race condition on tag type change am: 963eb722db -s ours

am skip reason: Merged-In Icd4b5a1615dac4548c6343344e17d7f087c7c057 with SHA-1 8227ca062e is already in history

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

Change-Id: I8f43bf3f40719f468d86d49169a76918a5676b45