Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am: 34e0a257d5
am: a2ed986390

Change-Id: I438bacc7028fb2c385a6dd21a79172f145490f6d