[automerger skipped] Revert "Merge "NetworkStackClient: Refactor network stack process interaction"" am: 9b9ed234cb -s ours
am: 5fa29d4ed5

Change-Id: I273721e2195c601b6b95b7f51ef98eb15ab7ab40