Fix circle not theming

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
merge conflicts