Merge "Remove AndroidTestCase from UnsupportedAppUsage"