[2/2] Frameworks: HALO

Add custom color.

Change-Id: I6b8a3e8b1057e466b947da63e5faf67560781837

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java