Merge changes I83ea92e3,I478d957b into main am: 11284d73a0

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

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