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