Merge "[Settings] Support getSystemService(Class<T>)" into sc-dev