[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a am: 778914e606 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 a065d07edf is in history
Change-Id: I79c066b158eb693ff3aef5dcae35f6634796aa4f
This commit is contained in: