Merge "Use androidx.test instead of android.support.test"