Merge changes from topic "2nd-landing-fix" into main am: b82cabf8c9

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

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