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: I81abc9500d6a7f1032ad231659b999d0ea9f6e92