Merge "Fix Launcher3 tests for tablets" into sc-v2-dev am: f02c754eb9 am: 4ed4ca3e22

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

Change-Id: Ib28420c70f6c30c0154b73788fb8159cb17fd824