Merge "Cancel pending timeouts when media data is removed" into rvc-qpr-dev am: 7040e32b

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

Change-Id: If0f3bee671c938e7a29876c9748adf388976bcd6