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

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

Change-Id: I97800e14e6319b1492d0a025cef40830b10be587