Merge "Fixing test that fail when FOLDABLE_SINGLE_PAGE is set to true" into udc-dev am: 2a40823a78

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

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