[automerger skipped] Update media visibility on lock screen am: 58fea4b8 -s...

[automerger skipped] Update media visibility on lock screen am: 58fea4b8 -s ours am: 4109578c -s ours am: 16301c41 -s ours am: 15084c7f -s ours am: 30a32a4d -s ours am: ed84d9d2 -s ours am: edc75ef5 -s ours

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

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



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