Merge "Fix CTS test" into tm-mainline-prod am: 7d93b6d806

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

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