[1/2] Prepare NotificationManagerService for new format

* Needed for blacklisting

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Change-Id: Ic0637908b152bc17b483f1469e21611c897aeb0e
Merge "[1/2] Prepare NotificationManagerService for new format" into android-4.4