Merge changes Ib5f541ed,Iff6a3cb1,I2ebd5c7a into main am: fafedb40c9 am: 25927c52e1 am: b152af794c

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

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