[automerger skipped] Merge "Remove reference of PhoneConstant." am: 6f82fe83f0 am: 83e2fa8b03 am: fcfcf4380b -s ours
am skip reason: Change-Id I22b85799ad547aca1ce4e63af3f39bc7f29618c6 with SHA-1 25f1de88dd is in history

Change-Id: Iea63d74c38fa146aecb3ac6d1ed1e6686b398146