Merge "Adds @hide ImsService APIs"