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

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

Change-Id: I21bab2295250dc13d747386c57cd4ed539457de1