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: I2f33da7376c4f788d6c6159710b26071247b5430