[automerger skipped] Merge "Migrate remaining cts to androidx.test." am: 40fadc421c am: 59492a091e
am: 596fd9d7f9 -s ours
am skip reason: change_id I092c369229f8cb4c13827cbad4fd162622ac7849 with SHA1 43905f8b50 is in history

Change-Id: I813354fcf60fae88ee35fe1bef1ebdfa6efa1fb6