Merge changes Idce2024f,I7e009073,I29fe506c,I37b2a0b8,Iccb4e3ec into main am: 49967eab24

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

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