[automerger skipped] Merge "Update media visibility on lock screen" into...

[automerger skipped] Merge "Update media visibility on lock screen" into sc-dev am: 1ed25c6c -s ours am: 1fae5dd0 -s ours am: d51c6f03 -s ours am: fb8fd051 -s ours am: ee445c3b -s ours

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

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



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