Merge "[automerger skipped] Merge "Switched out PhoneConstants.PhoneKey" am: 2be788e16d am: 87f18929be -s ours am skip reason: Change-Id I2e147c9dc4383f7979740f2fd3ded44cd7d060e4 with SHA-1 63514be238 is in history" into rvc-dev-plus-aosp