Settings: Add heads up blacklist options. (2/2)

Change-Id: I13d849b49bee6f516b591625c2ea2e69dff12885
Merge "Settings: Add heads up blacklist options. (2/2)" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7

Conflicts:
	src/com/android/settings/cyanogenmod/NotificationDrawer.java