Merge changes from topic 'notification' into mm-wireless-dev

* changes:
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821