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

Change-Id: Id05c5b7be9fd8b5d94734032b9bca93a32a95786