[automerger skipped] Merge "Introduce hasCompanionInCallServiceAccess API" am:...

[automerger skipped] Merge "Introduce hasCompanionInCallServiceAccess API" am: 83cc1b62 am: 8a37624f am: 94d34925 am: 7779d92c -s ours

am skip reason: Change-Id Id659bfae8556e965d3c31613848bde808f28a858 with SHA-1 4d065269 is in history

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

Change-Id: I33d518f23cdd0cc8cd0af72811d08d3b18fd6beb