Merge "Testing to see if waiting for transition to end will fix flaky tests" into sc-v2-dev am: 58763e47d6

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

Change-Id: Ied2373aac635bd248aa77a45e7a99713f63e0d52