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

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

Change-Id: Id49de0dd9e6e4711b2414a812740c5a82473c6cc