Merge "Migrate *ActivityUiTest to use ActivityInstrumentationTestCase2."