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

Change-Id: If3d0cfa9c563e05ff2e06bedc33c88ece5e590d4