Merge "Retain media controls longer" into tm-qpr-dev am: d2909c6c am: ba6f9d24

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



Change-Id: I310b08af6b0fe8b20ee09680e579ad940609ba69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>