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

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

Change-Id: Ia805c6228e91f2e0b3af1e49de8f1eedd620dbf4