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