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