Merge "Run AssistTestCases on the primary display" into oreo-cts-dev am: 355c0e2d59 am: 23d89bad16 am: 9e2d7e63d9
am: 2ef7973313

Change-Id: I8bba3c35a5091f6221819410ffd941c0819c1002