Merge "Merge "Adding back media resumption" into rvc-dev am: ad80df94 am:...

Merge "Merge "Adding back media resumption" into rvc-dev am: ad80df94 am: af474e93 am: 4dac0226" into rvc-qpr-dev-plus-aosp am: 0e0a710c

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

Change-Id: Ie497a5e904454169bb975fe77a9a6874994d29ad