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: Ib6c738b5f61976712b3ce5d25e9b702cf560584c