Merge changes from topic "cherrypicker-L94400030000731002:N23400030012047507" into main am: d7a9a654f7

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

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