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

Change-Id: I813c0659ae50fe68d14093c7cc95f7eb9f641c99