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