Merge "Fix unregistering listener issue" into tm-dev am: 429c7fa777

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/18709050

Change-Id: I0f759d754ce5ec31356502a515c88e0c936ef1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>