Merge "Remove reference when active listener is unregistered" am: a39b107812 am: e129460c46 am: ff64eaee16

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

Change-Id: I3beb653f02b63854412b8655a6d723350fc80dd4