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