[automerger skipped] Merge "Rewriting phone constants for mainline" am: 6ef59e4060 am: 9344a920b2 -s ours
am skip reason: Change-Id I9cf495f19f3a752459ed67aa21bf6e0510a66547 with SHA-1 d24bee4d32 is in history

Change-Id: I1431efb773ee62643d5cdf8c95c32dc3bea79033