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

* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications