Merge "Use overridden default xml for TwoPanelWorkspaceTest" into tm-qpr-dev am: 0c2d7e8da3 am: 7a7f6ce2c8

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

Change-Id: I052bec3d1505574c50c583d01f4b03d890f27cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>