Merge "Return for getBlockedPorts NonNull" into main am: c3a188d7dc

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

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