Merge changes Ia8a8eab7,I1e193f35 into main am: a4b6164304 am: 4f521b4bdf

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

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