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

[automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into 24D1-dev am: d495cb3f -s ours

am skip reason: skipped by ethibodeau

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



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