Merge changes from topics "remove-napt", "support-multipleaddr" into main am: 24b54c2285

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

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