Merge changes I224c1055,I0aa7b5cc,I3e0638a3 into main am: f2e2a48682

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

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