[automerger skipped] Merge "Allow core tests to use hidden connectivity API"...

[automerger skipped] Merge "Allow core tests to use hidden connectivity API" am: fd3fc5ff am: 5d34fc81 am: 69bc407c am: 62587fa0 -s ours

am skip reason: Merged-In I8f84d57360da34315d2388cb71b3d3738b4f483e with SHA-1 603c4fa7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978089

Change-Id: I58fab57c9d1099096a1345682f1511d1198fe82d