PIE: this is an all inclusive commit for pie. Includes everything needed for pie'
'

Conflicts:

	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java