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

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

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