Merge changes I6d0e5d34,I55af0796 into main am: 75551afe7a am: 05757ef267

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

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