Merge "Merge "Merge "DO NOT MERGE: Force SplashscreenTests onto Primary Display" into oreo-cts-dev am: 0296529513  -s ours" into oreo-mr1-cts-dev am: 5098ba5fa2  -s ours"