Merge "Migrate frameworks/base/packages/SettingsLib/tests/integ  to androidx.test"