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

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

Change-Id: I464bb8d4b3018df9202a49a3640cb4dfbb95d618