Merge changes I2399960f,I7b6e1a3b into main am: 0466125e93

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

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