Merge "Fix AddWidgetTest flake Test: ABTD" into tm-qpr-dev am: 07949ff3c8 am: ae9ee2bc27

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

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