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: Ia6ad70db07d10c2cbc5ed66f70e4a5dc0f7e2e0f