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

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

Change-Id: Iefe5025f40f2ed9f1fc4b5b75e3dc0b9e599f6b5