Merge "Rewriting phone constants for mainline" am: 6ef59e4060

Change-Id: I1b014b387086030af58c1fd7e6e373553225ece9