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: I8c8c5b6ca21947f1adcbd84c014e3ca83078708f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>