Merge "Add multicast address cleanup for test failures" into main am: d2c266cbe9

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

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