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

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

Change-Id: If0df0ea8f713253f2d0bfc45a7fe4c6709801255