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

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

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



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