Merge changes Id512ba6b,Ib57a4a93 into main am: f769efe3e4

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

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