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

Change-Id: I4c996f0e2e3d56bb36231f765a0d1a4d15cc171c