Merge "Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests"