[automerger skipped] Merge "Move NetworkStack to services.net" am: 762f9f0c24 am: 51490ad0fa
am: 0d49d3863b -s ours
am skip reason: change_id I501b125a388c1100c2182bde4670944c2f0d7a02 with SHA1 310da6f0e8 is in history

Change-Id: Iba45b354c8a6b690177a1bc9928ea87a5850515c