[automerger skipped] Merge "NetworkStackClient: Refactor network stack process interaction" into stage-aosp-master am: 3786d7188a -s ours am: 1ddfe2db8d -s ours
am: 580c63a556 -s ours
am skip reason: change_id I673581b0067b9a3f72dd68a3ab622c18183ebd2e with SHA1 b51c428f41 is in history

Change-Id: Id1920c11dae1b192d0449166f4079488a6c73159