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

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

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