Merge "Fixing a flake when workspace loading never finishes." into udc-dev am: 5fe61d4ff7 am: 88ad0211ac

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

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