Merge "Fix flaky multicast tests in Thread E2E test." into main am: f141b6ec7c am: 9b01fd290b

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

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