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

Change-Id: Ieb5331255e502c33b54df1cf8b15c391e958e49f