Merge "ConnectivityManagerTest: skip testBlockedStatusCallback in instant mode" am: e4f8d49c81 am: fb84e4e8c9

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

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