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

Change-Id: Ifcce0699f9434cf490f9b4b596ba7604208275c6