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

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

Change-Id: Ic10ce9220c6143473b01e4204a84d4ceea2cb5d1