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