Merge "Make testBlockedStatusCallback doesn't rely on validated network" am: 0530348e74

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

Change-Id: Ida042d88deb6af0429c9fe123355885e89dce6fa
Signed-off-by: Automerger Merge Worker <[email protected]>