[automerger skipped] Merge "Replace use of deprecated androidx-test build rule." am: d3efd1ad0c am: a16d173fc7
am: 8d5e64d94e  -s ours

Change-Id: I97c1111e4fb04789cf67f8c6c305d182ee218e3d