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