Merge changes from topic "block_port" am: 6de87582c1 am: 2c7b692068 am: 6257d62200

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

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