Merge "Use alternative PhoneStateListener formal API"