Settings: For the sake of search, don't split security settings.

    - There's also no good reason for having separate xml's for these.

Change-Id: I0216a2be10b801769eef7783f6c52a2b18b06aef