Merge "Fixed a regression where one couldn't go to the keyguard anymore" into sc-v2-dev am: 16ca8a816b am: c6431f231e

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

Change-Id: Ia672728b1e3f95d5636df591c5bbbc588911cd19