Merge "OTASP: use registraint instead of PhoneStateListener" am: c64a93abff am: 274e8e2c96 am: ef30b2e535

Change-Id: I34e3959a3df76be1aceb7c143df1fd13f91c87db