Merge "Relocate VpnManagerServiceTest and VpnTest to the frameworks" into main