Merge "Attemp to fix Launcher stay invisible after keyguard unlock." into...

Merge "Attemp to fix Launcher stay invisible after keyguard unlock." into tm-qpr-dev am: 30c78f9d am: dfbba5f0

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



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