am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1

* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
  Revert "Add new secure setting for controlling Messaging notifications"