Merge \"Move phone number formatting logic into DeviceInfoUtils.\" into nyc-mr1-dev
am: 53185e42b5

Change-Id: I5f02f164bdea326ab0ac1ad77239fda63bf27346