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

Change-Id: I3a97ca17def39eba4472ee3d0798a481bf46d1ab