Merge changes Ia8726375,I9d368d8a into main am: 7e89d18900

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

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