[automerger skipped] Merge "Add androidx.test variants of uiautomator and...
[automerger skipped] Merge "Add androidx.test variants of uiautomator and janktesthelper" am: d16cc82d am: 3f4697d3
am: b1ebd4b9 -s ours
am skip reason: change_id I7d2e240456f2d5b10ea6d78583d581949174ae4f with SHA1 4177b0de is in history
Change-Id: I735210bfddfdda955a3579050962000cfe7abeff