Change to use DATA_ROAMING setting correctly with subId.

Bug: 18466745
Change-Id: Ib2d7979d164ca3cf32c6619340fae1dc578ca686
1 file changed