Merge "[CTS] Fix CTS failure in mainline train" into android13-tests-dev am: 2d3df1b225 am: b1391d5d15 am: f460f6143b am: aabdbafcfe am: 311de7301c

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

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