Reorganize connectivity framework dependencies am: 6a20eeda42

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965526

Change-Id: Ib080b07e25a9538593cc5aa1d3a95b185b6342a7