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

Change-Id: If11f4288ac60c6284a3f0510061183b2418d8d11