Merge "Adjust to new androidx.test beta02 rules."