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