Merge "Revert changes waiting for launcher to resume when transitioning to...

Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c660 am: 2bd85043

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661



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