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

Change-Id: I63af5d24d233c12425610e5c6d15c9857bef3adb