[automerger skipped] Update media visibility on lock screen am: a8519e4683 -s ours am: a02f88b017 -s ours am: 42d996ac8f -s ours am: f2cf250f5a -s ours am: ba2f12e8ea -s ours am: 8328b2f33e -s ours

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

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

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