Frameworks: some fixes and rearrange of NotificationManagerService

cheers

Change-Id: Ifc09107b5f3189c4b722562fef7933f19ce2d2e8