[automerger skipped] Merge "Add missing features to static IP config" am: d026189c36
am: d6d07cef4d  -s ours

Change-Id: I145c2a63f0fce4d527d19d35949bdd938df3991e
tree: 05a337d5fcea8f36a487f08593ab8442882282b8
  1. service-t/
  2. tests/
  3. Android.mk