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

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

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