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

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

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