Merge changes Id723dc9e,I3665d843 into main am: b960664fa8

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

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