[automerger skipped] Merge "Rewriting phone constants for mainline" am: 03c3d36ce8 am: 5a935b209f -s ours am: 456c0354f3 -s ours am: 90ad3d9e7f -s ours
am skip reason: Change-Id I84d6687ca6cab86c8c68dc2dd2679cfee0919c1e with SHA-1 4bcbfce5fc is in history

Change-Id: I02e552a37bd511be6417d0c8abd41f7312ff0257