Merge changes Ic490fee6,If78047c3 into main am: 10353d5351

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

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