[automerger skipped] Merge "OTASP: use registraint instead of PhoneStateListener" into qt-qpr1-dev am: c7c39a1897 -s ours
am skip reason: Change-Id I34e3959a3df76be1aceb7c143df1fd13f91c87db with SHA-1 c32be286b9 is in history

Change-Id: I9d9a9abd337fd57717610d3b88b7f4f6baeb95fe