Merge changes If787d3f3,I6de357ac into main am: 057369c840

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

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