Merge "Fix CtsNetTestCases on Q" am: d651629b14 am: 92d84b2843 am: 55a37ba1cc

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

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