[automerger skipped] Type confusion due to race condition on tag type change am: c46f6bae6e -s ours am: c338a5067a -s ours am: 516737f8f3 -s ours am: 405c3eae00 -s ours am: a71458b501 -s ours am: d2536ec631 -s ours am: 212e8c4604 -s ours

am skip reason: Merged-In I93c36bf0f6b92e33a5d03d7420251f5bcf112d66 with SHA-1 963eb722db is already in history

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

Change-Id: Iaa1fd5d4e36482e3be1cfed47801df10ff1734e8