Restore ProfileGroup notification override functionality

Also clean up a little.

JIRA: CYAN-3164
Change-Id: I9b71a225996315f517b59d2d6f4074175bbf2d64
Merge "Restore ProfileGroup notification override functionality" into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_base into cd-4.4