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

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

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