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