Merge "Rename API for Call Companion InCallService API Review" into sc-dev