Merge "Fix TaplTestsLauncher.testWorkspace's page expectation for 2 panel" into sc-v2-dev am: 3c7bde72f7

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

Change-Id: I0a4971b48f8c82b98f5bc0ba45cd8d0140e04358