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

Conflicts:
	core/java/android/provider/Settings.java
	core/java/android/provider/Settings.java~
	packages/SystemUI/res/values/colors.xml~