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

[automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into udc-dev am: 6fcd1094 am: 30e8496b -s ours

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

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



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