Merge "Move ACTION_SIP_INCOMING_CALL back to Manifest" into oc-mr1-dev