Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
am: b67f9c939d
am: 8ad361f548
am: 11534c33c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416 Change-Id: If55688c5d5675f5f78feb6cd809521ceff640664 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: