Merge "Replace use of deprecated androidx-test build rule."