Merge "Migrate frameworks/rs to androidx.test"