Reorganize connectivity framework dependencies am: 6a20eeda42

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

Change-Id: I6c384f50da0a4f1521cde195640d1db9fa4fa173