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

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

Change-Id: Idc8f7cb19d3ee6efc688747d974aeaa58c4b3ed7