[automerger skipped] Rename API for Call Companion InCallService API Review am: 0e44b583b0 am: 77b01841f1 am: 4ee54008a1 -s ours

am skip reason: Change-Id Icd5de48fa5d338f7571f1127706fd11c5e8accc2 with SHA-1 2a33545876 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1607477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id425a5b40a47b9773975dec75814890477308481