Merge "Fix broken test" into tm-mainline-prod am: 4a75428c47

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

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