Merge "Removing default display assumption on ApplicationTest." into oreo-cts-dev