Merge "[CTS] Fix CTS failure in mainline train" into android13-tests-dev am: 2d3df1b225

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

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