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

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

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

Change-Id: I26b69d45b447fb7e6e3229c7d9c437be8f4c2dca