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