Merge "[Settings] Support getSystemService(Class<T>)"