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

Change-Id: I75d43755aa93fc370fe2c7ff37ec89c4f689eb3b