merge changes from Omni 4.4 into local branch

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

Change-Id: I10b0b1eade6d2776a66ad842e545c99ec51a8354