[automerger skipped] Fix overriding ip configurtion with default one am: 519e1dcae5
am: 40fc5ce47b  -s ours

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