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

Conflicts:
	AndroidManifest.xml
	res/values/ose_arrays.xml
	res/values/ose_strings.xml
	res/xml/quiet_hours_settings.xml
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/ose/NotificationDrawerQsSettings.java
	src/com/android/settings/ose/QuietHours.java
	src/com/android/settings/ose/service/SmsCallController.java
	src/com/android/settings/ose/service/SmsCallService.java