[automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into udc-dev am: 6fcd109412 am: 2c9d92dd61 -s ours am: 500330306a -s ours

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

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

Change-Id: I1b59009586df6065a909c06c6bf2965161963346
Signed-off-by: Automerger Merge Worker <[email protected]>