Merge changes I427360f6,Ie6dbbe22 into main am: 66ef9d35ce

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

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