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

[automerger skipped] Merge "Update media visibility on lock screen" into sc-v2-dev am: cd94c987 -s ours am: 2b60c4fc -s ours am: b31e0a14 -s ours am: 65c0a915 -s ours am: 712254bc -s ours

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

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



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