Merge "Migrate packages/apps/Contacts to androidx.test"