[automerger skipped] Merge "Update media visibility on lock screen" into tm-dev am: 65582eae03 am: 9eb475524d -s ours am: bb39d67cba -s ours

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

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

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