Merge "[flexiglass] Hooks up real app state and logic in keyguard (2)" into...

Merge "[flexiglass] Hooks up real app state and logic in keyguard (2)" into udc-qpr-dev am: 2f972251 am: 6774498f

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



Change-Id: I37f9b156a713204eddde370ca4556862c5b898e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>