Fix default wifi/usb tether network

Change-Id: I9392728a26c780108a5d30a61939f2d85a54922c

Conflicts:
	res/values/slim_arrays.xml