Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 am: f69a73793d
am: d0e81464bd

Change-Id: I8a2f552e3fa500f14e1912acbbbade3ea510715f