Merge "Fixed an issue where the keyguard media visibility was wrong" into...

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

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

Change-Id: I0f81041388523cae490129efba81fc595dc218b3