Merge "Fix CtsNetTestCases on Q" am: d651629b14

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

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