A few fixes

Change-Id: I33e6f663396a165fd143ba5833c0693a71fdedd6
Signed-off-by: PipelinerArd <kristoferard@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java