[automerger skipped] Merge "Cancel pending timeouts when media data is...

[automerger skipped] Merge "Cancel pending timeouts when media data is removed" into rvc-qpr-dev am: 7040e32b am: d6037a66 -s ours

am skip reason: Change-Id I2925814132c712b2482681f699f647bf5707e664 with SHA-1 f5e463fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12684219

Change-Id: I78ef401ba1f2dbcc5cec129b24ef853ca9b171a0