Merge changes I4c813a35,I9bedb58a

* changes:
  Toggle Security and Privacy entries depending on SafetyCenter status.
  Add SafetyCenter entry to Settings.