Merge "Add androidx.test variants of uiautomator and janktesthelper"