Merge "Fix CtsNetTestCases on Q" am: d651629b14

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

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