Merge "Fixes bug where home controls would show up before first unlock." into...

Merge "Fixes bug where home controls would show up before first unlock." into tm-qpr-dev am: e00464ef

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



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