[automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246 -s ours
am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 7cf9cb25e3 is in history
Change-Id: Ia476746bb37fee381245f49a801bf9abb32ba04d
This commit is contained in: