Merge "Migrate remaining cts to androidx.test."