[automerger skipped] OTASP: Replace PhoneStateListener with registrant. am: f29a3a3430 -s ours
am skip reason: Change-Id I0890895853125a65b61bebe8f83f84624bab24b7 with SHA-1 0cbcd0dfad is in history

Change-Id: I4c47c85f75bb614e7ebd1caa8459faf79fd2c055