[automerger skipped] Merge "services.net: Add a static library needed by wifi...

[automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: 488efe33 am: 2b024e75 -s ours am: aa4f5cef -s ours am: 80aede76 -s ours am: b2847be8 -s ours

am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 b6361f94 is in history

Change-Id: I7c2b39a6843e480105c826c88d7e86589b7da2fa