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

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

Change-Id: Ifa41b814e21b35f0ca27515e5e2f80b63cac1f7c