Merge "Testing to see if waiting for resume will fix flaky tests." into sc-v2-dev am: 1c79327f6e am: 27f2fb355d

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

Change-Id: I639d286a0ab06b41a3ad8fd65d996e1c3576ae49