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

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