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: 76b22b3e am: 33242899" into tm-qpr-dev-plus-aosp am: f25dcf07

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



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