Merge "Migrate frameworks/base/packages/SettingsProvider/test  to androidx.test"