[automerger skipped] Merge "DO NOT MERGE: Move to androidx.test version of device utils" into pie-cts-dev am: 2bcc074944 -s ours

am skip reason: subject contains skip directive

Change-Id: I7757dcfb19becb94fd9c06a9eedd72a6f39708ff