Merge "Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f39 am: 2364eaf2" into rvc-d1-dev-plus-aosp am: 3b3345ba am: 86b66e81

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

Change-Id: Iff182fd27f0c8f70a7ab0f2a2b96c9e9071221f0