[automerger skipped] DO NOT MERGE Migrate external/dexmaker/ to androidx.test am: a5501fd473 -s ours
am: 82eb0e778a -s ours
am skip reason: subject contains skip directive

Change-Id: I9ef49dfcc19de5ce0d462061afc0cbad425c35d5