[automerger skipped] Type confusion due to race condition on tag type change am: 8227ca062e am: e69b08a43f am: c14c7c8da6 am: 0f581ecc88 -s ours am: 63457c48a2 -s ours am: 114bc03fc4 -s ours

am skip reason: Merged-In Iebfcaf9d269381ef2ba14a26e6124f173d2299ec with SHA-1 ad4982472c is already in history

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

Change-Id: I9944df6d416a39267fc94ad1c12987cfacff2237