Merge "Adding wait to test if the flake is a race condition" into udc-qpr-dev am: b8ca7ae13c am: 98dfe6cf8b

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

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