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

This reverts commit 26b932f77f746c577411ebcd652ec0eac2c47cd9.