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

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

Change-Id: I336ab4181fd9964094b189151e8458a58acedc27