Merge "Merge "CTS: Wait for InstrumentationTestActivity to start" into oreo-cts-dev am: 6b41d72d57" am: 2ecb67fb9e
am: 5913c58d56

Change-Id: Ic7e75c8a9b651744c728528cf2370b64637b9177