Merge "Enable large screen flag in the Settings app" into sc-v2-dev am: a67a07e2fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16187602

Change-Id: I001ac219364f4293d55739d8ce0579dd4d81dbd4