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

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

Change-Id: I6e4c65d2d8fb53a2f39d2c94e020f171f50de2b2