[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 skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 b6361f94 is in history
Change-Id: I7282fcc56290c105d7f3f03320503d53d31493fa