Merge "Companion InCallService API review" am: b7cc3c6106

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib967a0256b39150a190dc4cb7b8b7f7a00d3fdd7