[automerger skipped] OTASP: Replace PhoneStateListener with registrant. am:...
[automerger skipped] OTASP: Replace PhoneStateListener with registrant. am: f29a3a34 -s ours am: 8e289860 -s ours
am skip reason: Change-Id I0890895853125a65b61bebe8f83f84624bab24b7 with SHA-1 0cbcd0df is in history
Change-Id: Iad66e5ddecb3aed72476bce6975a469ba020160c