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
Change-Id: Iebfcaf9d269381ef2ba14a26e6124f173d2299ec
(cherry picked from commit b8057f7a38d5817314f6f2e58bd4a721ec8af82f)
(cherry picked from commit ad4982472cdf83d9ba8eb75078ca1c3bc05f6b23)
1 file changed