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

Change-Id: I9d1347055c90a49d141da6d34c85ab2a7cb080c1