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

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

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