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

Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b