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

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



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