Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main am: cc26d678f2

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

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