[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pie-cts-dev
am: 4fb729db4e -s ours
am skip reason: subject contains skip directive

Change-Id: I71b2f3cb44260abea706f86371339237447f076b
tree: 3a764c4384a23bd105d293509d79a76baf20204f
  1. tests/