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

Change-Id: Ia72af5433dae2d200503a91a92c91729eae1eadc