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

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

Change-Id: I65a3be70bfb6d0ea13f72ddc3dbf01351a33cfa6