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