Merge remote-tracking branch 'slim/kk4.4-caf' into ose

Conflicts:
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/IActivityManager.java
	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/ose/QuietHoursHelper.java
	core/res/res/values/ose_strings.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/slim_strings.xml
	packages/SystemUI/src/com/android/systemui/ExpandHelper.java
	packages/SystemUI/src/com/android/systemui/ReminderReceiver.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuietHoursTile.java
	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/policy/HeadsUpNotificationView.java
	services/java/com/android/server/BatteryService.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/VibratorService.java