Merge changes I0afdda02,I1c47f616 into main am: 5f730c6ab5 am: da62c511c0 am: 3a684c163c

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

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