Merge "Reintroduce android.test.base for Android R apps targeting Android Q."