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

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

Change-Id: I07fa9412046ea05d4860da92414287438921b24a