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