Merge "Merge "Cache SHOW_MEDIA_ON_QUICK_SETTINGS" into tm-dev am: f944c485...

Merge "Merge "Cache SHOW_MEDIA_ON_QUICK_SETTINGS" into tm-dev am: f944c485 am: f145dc27 am: b48ac9d9" into tm-qpr-dev-plus-aosp am: 0b8dc4bf

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



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