Add On-The-Go Toggle [2/2]
Change-Id: Ia77e806e3b7fc4ab9956b3ffe890c830030788a0

Conflicts:
	res/values/ose_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Conflicts:
	res/values/ose_strings.xml

Conflicts:
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java
 Evisceration authored on Mar 15