Merge "Removing default display assumption on ApplicationTest." into oreo-cts-dev
am: 790ad55462

Change-Id: I7eddab13671c501b5b5015ebabcdec3b4783302b