Merge changes I6d267dda,I2a9aa02b into main am: a22fdc2214 am: a5d2836ba6

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

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