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: Iebfcaf9d269381ef2ba14a26e6124f173d2299ec
Change-Id: Icd4b5a1615dac4548c6343344e17d7f087c7c057
(cherry picked from commit 8227ca062e2a60d811756ff97ff96c1412ef34b3)
3 files changed