[automerger skipped] Type confusion due to race condition on tag type change am: 963eb722db -s ours am: 2483a6541b -s ours am: 25b6a4a4c7 -s ours am: 1cc688751a -s ours am: 81e4b561b6 -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: Ie5049d5223255085c53915178b8410a65e8babc1