[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c am:...
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c am: c405329c -s ours am: c1ee210a -s ours
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd is in history
Change-Id: I0d58b4bb5baef39bc9b05dca64e432483d132d6f