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