Reconcile NotifcationManagerService + Re-add ProfileGroup

Change-Id: I1b780afc8888fc65a649ca6bca46cf35d47d8013