Merge changes I52fcfd3f,I6de4abdc,I1e8944de,I9525bfe0,Ife09fef8, ... into main am: 868859d4ef am: af5fb4dfdc am: 761c9f17c5

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

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