Merge "Merge NetdServiceMonitor into NetdMonitor." am: 44021f4a17

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

Change-Id: I0a695f1b57a8c45cafcdb156c6dca0f9fc02e87f