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

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

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