[automerger skipped] Merge "DO NOT MERGE - Migrate remaining cts to androidx.test." into pi-dev
am: c582672ed4 -s ours
am skip reason: SHA1 c582672ed4 skipped by user brettchabot

Change-Id: Ifd6844b4330dbc5e55fd813fa9b2ed3c48ec467f