Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a2403

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



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