Merge changes I163e21fd,I1b0943d3,I3af8e7f1 into main am: 962ac591bc

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

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