Merge changes I2399960f,I7b6e1a3b into main am: 0466125e93 am: 8fa31ad179

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

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