[automerger skipped] Merge "Update media_controls_lock_screen setting...

[automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into tm-qpr-dev am: 855e2a7f -s ours am: e2b7bff3 -s ours am: 4bc5c4c2 -s ours

am skip reason: Merged-In I4f618e4013db894291e6fca9d49bceb1cb7e4bd9 with SHA-1 a441f4ac is already in history

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



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