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