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

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



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