Merge "Refine layouts for large screen" into tm-dev am: 51316c13

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489



Change-Id: I58366792b3bb490d5131b28b5218ef8486988971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>