Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU"

* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"