Merge "Move VpnManagerServiceTest and VpnTest to frameworks" into main