Merge "Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests" am: e25900bbbf am: 9e998e80b9

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

Change-Id: I376bd600d31d4c551a1aeeda720ccd787ea3ce62