Merge "Reduce usages of main looper in sysui tests" into pi-dev
am: 5be1956952

Change-Id: I2b640c3c312513a7cb1a5747715fdba55dcfc6d9