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

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



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