Merge "[automerger skipped] Merge "Switched out PhoneConstants.PhoneKey" am:...

Merge "[automerger skipped] Merge "Switched out PhoneConstants.PhoneKey" am: 2be788e1 am: 87f18929 -s ours am: f618d7d0 -s ours am: 067dc353 -s ours am: 91a06d15 -s ours

am skip reason: Change-Id I2e147c9dc4383f7979740f2fd3ded44cd7d060e4 with SHA-1 63514be2 is in history

Change-Id: I27adb4abd2180f3a06e087357c5d803ef2789d83