[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: ab4d5b7b54 -s ours

am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 e96fc18ad8 is in history

Change-Id: I79c066b158eb693ff3aef5dcae35f6634796aa4f