Merge "Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev am: 6a630f3994 am: 2364eaf2e6" into rvc-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-07-15 19:56:58 +00:00
committed by Android (Google) Code Review

Diff Content Not Available