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

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



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