Merge "Remove reference of PhoneConstant."
am: 6f82fe83f0

Change-Id: Id1122118bf76d3594710fc97908f3b0ac06604ac