Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970 am: aa6314e229

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

Change-Id: Ibf65d816f37d6e9912922cc789cefe70a4e660fd