Merge "Merge "Revert "Remove the system new message notification...
Merge "Merge "Revert "Remove the system new message notification automatically."" into nyc-dev am: 90dc5981 am: af65124e" into nyc-mr1-dev-plus-aosp
am: 69bbb83c
* commit '69bbb83c':
Change-Id: I6873bb91b8a720fbf430f04f0d400afcac9e681b