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

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

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