[3/3] Settings: Audio Themes Settings

Conflicts:
	res/xml/sound_settings.xml

Fw/b: http://gerrit.dirtyunicorns.com/#/c/2148/
Fw/av: http://gerrit.dirtyunicorns.com/#/c/2149/

Change-Id: I8aad04a642441b91617943e6941841aec859396d

Conflicts:
	res/values/strings_custom.xml
	res/xml/sound_settings.xml

Conflicts:
	res/values/liquid_strings.xml
Add Fast Charge QS Tile [2/2]

Change-Id: Iafd5ee0eefa9f7abd41b03ea7fa4e976c573e61c

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

Conflicts:
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java
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