Commit 97164ee5 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: 9f3903ed -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: I80a9b03dbae2c7bb20ed86b91fbe7b0a6c7aa13a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

There are no changes