Cancel pending timeouts when media data is removed

Bug: 160944177
Test: manual - verified repro steps in b/160944177#comment32
Change-Id: I2925814132c712b2482681f699f647bf5707e664
(cherry picked from commit f5e463fa86ac5ce4789ecf92f0ddb868cd32c866)
Merged-In: I2925814132c712b2482681f699f647bf5707e664
(cherry picked from commit 283a2e1d6e850ac80c7fb3b88e67ad23eb9e816e)
2 files changed