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