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

Change-Id: I28a7c2efe1195b456416f889480cf4b4eb623e6c