HALO (1/2)

Change-Id: Id5bc6c39af2f124c7ada4ba7feb4aff0fa7cc3a0

Conflicts:
	core/java/android/app/INotificationManager.aidl
	core/java/android/app/Profile.aidl
	core/java/android/provider/Settings.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	services/java/com/android/server/NotificationManagerService.java