A2D Advanced Settings

Move HFM settings here and add device settings back

Change-Id: I9dd96fa1dfc281ed8f9712081e7e47b7c01283a5

Conflicts:
	res/values/liquid_strings.xml
	res/xml/liquid_main_settings.xml