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: 2bc77140 am: 0eeb5c9c

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



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