Merge changes I9fb420ec,If00a7dc5,I8025cc2e into main am: 495fe09110

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

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