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

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

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