Merge "Fix test failure on S image + S module" am: d6446263ce

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

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