Commit a52ef69a authored Apr 02, 2024 by Beth Thibodeau Committed by Automerger Merge Worker Apr 02, 2024

[automerger skipped] Update media_controls_lock_screen setting behavior am: 06e0a7b6 -s ours

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

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

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

There are no changes