Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: a957ca5bfd am: 35174d85d2

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

Change-Id: Ibafa788b62236b2582e1ecb01418f94604cf6003