Merge "Add androidx.test.janktesthelper and androidx.test.uiautomator" into pie-cts-dev
am: b1a0c21592

Change-Id: I9efbb33d0dde2343cd0d9531642036035b739c90