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

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



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