[automerger skipped] Merge "Move NetworkController & friends to a connectivity...

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

am skip reason: Merged-In I1906761ef4d0f6ab979b8338cc1842b649982d70 with SHA-1 0beddd25 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909438

Change-Id: I7d88e2af73e9e919e4e14157a805747adccfdb71