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

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

Change-Id: Id0f7d537d2c67a5874708b2db1845da8c9c0b131