Merge changes I0afdda02,I1c47f616 into main am: 5f730c6ab5

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

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