Merge "Drop circular dependency" into main am: 588a9d5b26

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

Change-Id: Ifc54cb0c3edaef220f79fa4172a21aa57a63c1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>