Merge changes Id512ba6b,Ib57a4a93 into main am: f769efe3e4

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

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