Merge "Migrate Test Targets to New Android Ownership Model" into main