[2/2] Prepare NotificationManagerService for new format

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