Merge "Use same calculation for portrait as fake landscape for layout of split thumbnails" into udc-dev am: 5873535e49 am: c3dbe6e06a

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

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