Merge "Fix the hidden task was removed before starting home" into udc-dev am:...

Merge "Fix the hidden task was removed before starting home" into udc-dev am: d4ef43a7 am: e2e8289b

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



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