Merge changes from topic "cherrypicker-L22800030000756195:N75200030012855151" into main am: a2b8066354 am: ef5af1f007

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

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