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

This reverts commit 33fccf565e183d585365c6ade73d885c7c86d596.

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