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

Change-Id: I7387f80b6c684fe7e27023c3b9a5eeee37297cf8