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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

Change-Id: I72d41999cf667c0be0fb9c99e2bbbabea3b106d9
Merge branch 'sgt7/cm-11.0'

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java