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

[automerger skipped] Merge "Update media visibility on lock screen" into sc-qpr1-dev am: 201a2e12 -s ours am: c4ad255e -s ours am: 1dfa9572 -s ours

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

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



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