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

Change-Id: Ia781bd2043a89f34980594d26d472e6604016388