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

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

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