Merge "Update font/display size pages for support large screen in SuW" into...

Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev am: 9ade901d am: 87895d08

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

Change-Id: Icb7de5c7fc4bd8f89f7ef04b0cd9e8eb36a1c882