Merge "DO NOT MERGE: Force SplashscreenTests onto Primary Display" into oreo-cts-dev