[CTS] Fix CTS failure in mainline train 2/2 am: b0b4fa9c10 am: b630dfc3a9 am: 7d1b06b2f8 am: e144e7a40a am: d8797e74a9 am: 1976d3f457

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

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