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

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

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