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

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

Change-Id: I0b95f39f347516b05b82c860be079cb17de474db