[automerger skipped] Merge "Update media visibility on lock screen" into sc-qpr1-dev am: 201a2e128c -s ours am: c4ad255e2c -s ours am: 1dfa95720d -s ours am: 01580ef5cf -s ours am: c94c565fc8 -s ours am: 6a96f80b2d -s ours am: 9f6bdd714d -s ours

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

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

Change-Id: I31d6b83949aeaa25bd2dcf253899cd08a0afa6e5
Signed-off-by: Automerger Merge Worker <[email protected]>