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 am: faabf08e

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



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