Revert "[2/2] Prepare NotificationManagerService for new format"

This reverts commit 33fccf565e183d585365c6ade73d885c7c86d596.

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