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

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

Change-Id: I34fb8e6cabbfa27bbdfa7c8b1d2502fc5a39835b