Merge "Making ReorderWidget test more reliable" into tm-qpr-dev am: 1b7a1406 am: f351bd7c

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



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