SystemUI: Make wifi combo margin themable

Change-Id: Ie77b13cee84d5b472f878dba6388f3e168f5a249

Conflicts:
	packages/SystemUI/res/values/liquid_dimens.xml

Conflicts:
	packages/SystemUI/res/values/ose_dimens.xml