[automerger skipped] Merge "Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests" am: e25900bbbf am: fdc606235d -s ours

am skip reason: Merged-In I40740200fe4a7476a21bb5330429a11c97e38fb8 with SHA-1 7174ac3d86 is already in history

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

Change-Id: Iff300046bd2c7cec4f9c1ea6dac23e21a46a30b3