[automerger skipped] Merge "Companion InCallService API review" am: b7cc3c61...

[automerger skipped] Merge "Companion InCallService API review" am: b7cc3c61 am: a63d1250 am: c9443c89 -s ours am: e4aa751d -s ours

am skip reason: Change-Id Id75e727f6c3fc42132a80f7258bf790be79acf19 with SHA-1 93273fd6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33d6ce1fff00b0c1fafe26691e203906889a5ad5