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

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

Change-Id: I0d305ee3fbab44cbb47c15da376ad5731f54e379