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

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

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