Merge "Merge "Use keyguard state directly instead of trying to remember it"...

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

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

Change-Id: I622748fa5d3e08017c9cad2d7cae93db52927742