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

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

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