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

Change-Id: Ie359e9c809c8c9ebda26351d4377fe936f567f3d