Type confusion due to race condition on tag type change

Pending timers need to be canceled before a tag type is changed.

Bug: 192472262
Test: build ok
Merged-In: Icd4b5a1615dac4548c6343344e17d7f087c7c057
Merged-In: Iebfcaf9d269381ef2ba14a26e6124f173d2299ec
Change-Id: I93c36bf0f6b92e33a5d03d7420251f5bcf112d66
(cherry picked from commit 963eb722db5c209a0c07e8770fa4a2a80e1929b6)
3 files changed