Merge changes I7ad55374,I4a0c7f6e into main am: a8e3bfb7df

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

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