Merge changes from topic "v1_impl_cherrypick" into main am: 7a2152a0aa

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

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