Merge "Adds @hide permission granting API for ImsServices"