[automerger skipped] Merge "Rewriting phone constants for mainline" am: 03c3d36c am: 5a935b20 -s ours am: 456c0354 -s ours am: 90ad3d9e -s ours am: 73571661 -s ours
am skip reason: Change-Id I84d6687ca6cab86c8c68dc2dd2679cfee0919c1e with SHA-1 4bcbfce5 is in history

Change-Id: Ie919a0ca660d8e5bb4bdb4b344c4a62e7864858a