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

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

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