Merge "Migrate remainder of frameworks/base to androidx.test"