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