Merge "Track non-telecom calls in telecom metrics." into main