[automerger skipped] Merge "Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests" am: e25900bbbf am: 9e998e80b9 am: 7b92288c9a am: d59fe83586 -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: I1fd369c5c5389e8d73369574efa83c4aef226bd6