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

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

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