Merge "OTASP: use registraint instead of PhoneStateListener"