Merge changes Icfcc7ade,I1481cb8f,Ic2e8ca0d into main am: f582074f69

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

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