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

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

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