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

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

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