Merge changes I84da9c74,I1f3a68d2 into main am: 0e8c8d9792

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

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