Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5 am: b67f9c93 am: 8ad361f5

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



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