Merge "Migrate packages/providers/ContactsProvider to androidx.test"