Reorganize connectivity framework dependencies am: 6a20eeda42 am: 7abb73ca83

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

Change-Id: I07189e092b820b675ff2f23580a43b4fcf2af279