Merge "Move phone number formatting logic into DeviceInfoUtils." into nyc-mr1-dev