[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: 9eb47552 -s ours am: bb39d67c -s ours am: 9ef9fa00 -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: I6714d586c53c12b85481e855f034ac1d97262677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>