Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf am: f69a7379 am: d0e81464 am: c2b7dd0d Change-Id: Ia72af5433dae2d200503a91a92c91729eae1eadc