Merge "[automerger skipped] Merge "Move NetworkController & friends to a connectivity package" into sc-v2-dev am: c1301ad7 am: 15f4b261 -s ours"