Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0

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

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