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

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

Change-Id: Id5d18e80bb303f6672db4865341a68191549bff4