Merge changes Ib0df2810,Ic8dcb7e5 into main am: 8a14358e16

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

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