Merge "Adding back media resumption" into rvc-dev am: ad80df940b am: af474e93e9

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

Change-Id: I08a69638161ef631f61392eb44811bb83d3f80d9