[automerger skipped] Merge "Rewriting phone constants for mainline" am:...
[automerger skipped] Merge "Rewriting phone constants for mainline" am: 1d04d53c am: 941a620a -s ours
am skip reason: Change-Id Ia996798cc3e0d1fee82f32365d53876dee572579 with SHA-1 5f2993d2 is in history
Change-Id: Icccefd6bd07f71734961dcc76d07d0396175a1e9