Merge "follow up aosp/2600007" am: dc8df135cb

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

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