[automerger skipped] Update media visibility on lock screen am: 0d533a9c -s...

[automerger skipped] Update media visibility on lock screen am: 0d533a9c -s ours am: 921fe56f -s ours am: 189e3a0a -s ours am: 94bac4d9 -s ours am: c8d45081 -s ours am: 2a5a8e63 -s ours am: 6de778b7 -s ours am: b9269050 -s ours

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

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



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