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: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>