Merge "Use consistent, correct terminology for vendor API levels in VTS tests." into main