Halo Toggle [1/2]

Change-Id: I5e3b3b7c656ebbec7436afc3b8cd8e150f99992b

Conflicts:
	core/java/com/android/internal/util/slim/QSConstants.java
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Ad blocker toggle [1/2]

Halo Toggle [1/2]

Change-Id: I5e3b3b7c656ebbec7436afc3b8cd8e150f99952b

Conflicts:
	core/java/com/android/internal/util/slim/QSConstants.java
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
App Circle Bar Toggle [1/2]

Change-Id: I0d32443fbb1630fa0fc8c28f85d890182123b2dd

Conflicts:
	core/java/com/android/internal/util/slim/QSConstants.java
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java