Merge changes I6d267dda,I2a9aa02b into main am: a22fdc2214

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

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