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

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

Change-Id: I70569d18a8a826b9dfed0afa7ec7a6ff624bdbb6