Merge "Fix flaky multicast tests in Thread E2E test." into main am: f141b6ec am: d2610c4e

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



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