Merge changes from topic "block_port" am: 6de87582c1

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

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