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

Change-Id: I55f02cf5f8bec1d2e2bbb755d00619623c4653e5
tree: d73af6f88a53f17f535c6dca6ef957f36d5475b6
  1. tests/