Merge "Remove AndroidCarApiTest" into main