Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev
am: e24457409e

Change-Id: I5998fd5c20c43a3a5595919abc4c77a0715ab044