[automerger skipped] Merge "Fix flakes in testMultipleProbes" into rvc-dev am:...

[automerger skipped] Merge "Fix flakes in testMultipleProbes" into rvc-dev am: c0816168 am: efcfdc61 -s ours am: a1b09203 -s ours

am skip reason: Change-Id Ica21c23af0472edc6ead123365b39e42e69f85cb with SHA-1 09d6e155 is in history

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

Change-Id: I32a30f4c21fff187b1559807f263e106c99cc2b5