Merge "Update media_controls_lock_screen setting behavior" into udc-dev am: 6fcd109412

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

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