Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am:...

Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5 am: 492530af am: 4a048e40

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



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