Merge "Fix CtsNetTestCases on Q" am: d651629b14 am: 5b658859b8

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

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