Merge "Refactor the getCurrentCarrierNameForDisplay" into main