[automerger skipped] Update media visibility on lock screen am: 0d533a9c51 -s ours am: 921fe56fb7 -s ours am: 189e3a0aba -s ours

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

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

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