[automerger skipped] Merge "Use the new NetworkStackConnector constructor"...
[automerger skipped] Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc61 am: ab4d5b7b -s ours am: ddc8ff90 -s ours
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 f20a14a0 is in history
Change-Id: Ic06de69f6d9ac8e16c89334ed8a173745b8ae342