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

Change-Id: I5e91ca6269008ea53ee178c189b2a9bc96d6465e