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

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