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

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

Change-Id: I901d2b1c78b526a470bce67b3c935195758bc06d