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

Change-Id: Ie359e9c809c8c9ebda26351d4377fe936f567f3d