Merge changes Ie1a36c3c,Id727cf7b,Ifba198d9 into main am: 87f7f27ad0

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

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