Merge "Fix foldable single page bug" into tm-qpr-dev am: 00cbb5e6 am: 605e5ae7

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



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