Merge "Move ACTION_SIP_INCOMING_CALL back to Manifest"