Merge "Fix test breakage caused by androidx.test upgrade."