Reorganize connectivity framework dependencies am: 6a20eeda42 am: 1466f90607 am: 0958ee3a9c am: 12ec920ebd

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

Change-Id: Ifa25c9190332aef53cc8d891e064eabe5f29ec5c