Merge "Fixing Launcher3 tests" into sc-dev am: f4cacd720c

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

Change-Id: I0f70bf0ba3061662186b69844435960e2ca5c05b