Merge changes from topic "block_port" am: 6de87582c1 am: 5ba013208f

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

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