[automerger skipped] Merge "Update media visibility on lock screen" into sc-dev am: 1ed25c6c43 -s ours am: 1fae5dd004 -s ours

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

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

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