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

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

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