Merge "Fixed an issue where the keyguard media visibility was wrong" into sc-dev am: 426e0e73 am: ec16de4f am: ff8c51a3

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

Change-Id: I654d0ff3496a22eadd27c96cb82dd7fdcff9abb1