Reorganize connectivity framework dependencies am: 6a20eeda42 am: 1466f90607

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

Change-Id: I9ea58b047e03068dcf4500ecfe7479534200b562