Merge "Companion InCallService API review" am: b7cc3c6106 am: a63d125010

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52e18abe08b9258687e9a27b2e8e549cc6f39874