SystemUI: Make wifi combo margin themable

Change-Id: Ie77b13cee84d5b472f878dba6388f3e168f5a249
Merge "SystemUI: Make wifi combo margin themable" into kitkat