Merge changes from topic "credManSettings"

* changes:
  Calling isServiceEnabled with the context in credential manager settings
  Revert "Revert "Add Credential Manager settings""