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

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



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