Merge "Update device entry intent on keyguard vis change" into sc-dev am: ce9f73ca am: 7fb32fca am: 6f452682

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

Change-Id: I4239ce26f8689374e35ed7075e50e402cc738484