Merge "NetworkStackClient: Refactor network stack process interaction" into stage-aosp-master