Merge "Update media visibility on lock screen" into tm-dev am: 65582eae

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



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