Merge "Migrate remaining cts to androidx.test."
am: 7b68d37b76

Change-Id: I32a8d50322c5a09458a0ed93270c67d3c85b68ab