[automerger skipped] Merge "Switched out PhoneConstants.PhoneKey" am:...
[automerger skipped] Merge "Switched out PhoneConstants.PhoneKey" am: b9792c2d am: d5dd904d -s ours
am skip reason: Change-Id I2e147c9dc4383f7979740f2fd3ded44cd7d060e4 with SHA-1 8f2e2f2e is in history
Change-Id: I3c7aa18f0968ff8c07721500e6e3aec89168ed2a