Merge changes Ic69fc75e,I6373d251 into main am: 8a88d85145 am: 31f7fd8546

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

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