Merge "Remove import for PhoneConstants" am: c6e8d21247 am: 5c74dc63ae

Change-Id: Ifd6c5075fc17e62d139ea54ba35ab0d95a551fe6