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

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java

Change-Id: Ie02450be927c44d80366eedfd88c4572edbd7487