Merge "Remove import for PhoneConstants" am: c6e8d21247

Change-Id: I90e8d747d9715723b741b9138e1cc01d702b7717