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