Merge "Trying to remove waiting for broadcasts" into tm-dev am: ce43fb91

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



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