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

[automerger skipped] Update media visibility on lock screen am: a8519e46 -s ours am: a02f88b0 -s ours am: 42d996ac -s ours am: 6ed776c6 -s ours

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

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



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