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