Merge "Update references to use PhoneConstantConversion"
am: 79694e79d1

Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22