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

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



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