Merge changes Ia8a8eab7,I1e193f35 into main am: a4b6164304

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

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