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