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