Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Downloads.java
	core/java/android/provider/Settings.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	services/java/com/android/server/am/ActivityStack.java

Change-Id: Icd764a3614f78a23eba848fa2d67b2fce97d3ed3