[automerger skipped] Merge "Add missing features to static IP config" am: 5a4b8793d4
am: 844709958d  -s ours

Change-Id: I145c2a63f0fce4d527d19d35949bdd938df3991e
tree: 3a5c9c6dc299819de04cee113981e12a81b7a65c
  1. java/
  2. tests/
  3. Android.mk