[automerger skipped] Merge "Enable large screen flag in the Settings app" into...

[automerger skipped] Merge "Enable large screen flag in the Settings app" into sc-v2-dev am: a67a07e2 am: d9cbb799 -s ours

am skip reason: Merged-In Ib2490a58c39cfeddc588c5355b652fcb86d391bd with SHA-1 475b7837 is already in history

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

Change-Id: I50d812fcb6b0ebcc3dcdf04bdcfe24c95566171f