Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	services/java/com/android/server/power/ElectronBeam.java