[automerger skipped] Fix overriding ip configurtion with default one am: 6c61d1013d am: 07de1385c3  -s ours
am: 502d3cf9c5  -s ours

Change-Id: I8d41aaf789a90e71fc1e9327d804db3dd0e947d8
tree: 7d8fba327c516746ce54f551a54077f016febe41
  1. service-t/
  2. Android.mk