Merge "do not report wifi calling if cross sim calling is enabled" into sc-dev