Merge "Merge "DO NOT MERGE: Display Size warning only applies to default display." into oreo-cts-dev am: 3fc75dd22e  -s ours" into oreo-mr1-cts-dev
am: 2515578648  -s ours

Change-Id: If4b5e2b7122cda97a42fecc0c8584a4333fc3cd8