Merge "Rewriting phone constants for mainline" am: 03c3d36ce8

Change-Id: I354cec0b3891a8cdc1f8069dd6b7de523a08aa5f