Type confusion due to race condition on tag type change am: 8227ca062e am: e69b08a43f am: c14c7c8da6

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

Change-Id: Iffcda368db9a24e17794f3d837383c6e6380cea9