Merge "Move ACTION_SIP_INCOMING_CALL back to Manifest" into oc-mr1-dev am: 5aee651772
am: 1c1021f954

Change-Id: Iedf3f698cacbfc3eefb6615949cf67cf487d56a9