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

[automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into udc-qpr-dev am: 94efbce5 -s ours

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

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



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