Merge changes Ib24809ec,Id9d26435 into main am: 270813c4c5

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

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