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

[automerger skipped] Merge "Update media visibility on lock screen" into tm-dev am: 65582eae am: 2044b9af -s ours am: 27a2222a -s ours am: 856554b8 -s ours am: 916a24f7 -s ours

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

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



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