Merge changes I0be59107,Iaf5f3f9b into main am: f116ee1627

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

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