Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152 am: 94f72199

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



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