Merge "Migrate remaining cts to androidx.test."
am: 40fadc421c

Change-Id: I32a8d50322c5a09458a0ed93270c67d3c85b68ab
tree: bf5b12f3bf6d017736f06bf95b2ec7ef989fa0ab
  1. tests/