[automerger skipped] Update media visibility on lock screen am: 58fea4b8b8 -s ours am: 4109578c7e -s ours am: 16301c41f2 -s ours am: 15084c7fc6 -s ours

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

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

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