Merge changes from topic "update-ipv4-multicast" into main am: 3ffdc0b516

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

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