Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: e156e0d96c am: 5cabf788b8 am: fb2b66075d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391 Change-Id: Ic0bb0d7ffaeeaf99032dbf992af6b103db3dd2ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: