Merge commit '4.4.1_r1' into ose-4.4

Change-Id: I1f83f8173d06cb7623a7285396420a9e92f67b9b

Conflicts:
	core/java/android/widget/ProgressBar.java
	core/res/res/values-mcc310-mnc260/config.xml
	packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java