[automerger skipped] Merge "Introduce hasCompanionInCallServiceAccess API" am: 83cc1b62f0 am: 8a37624fe2 am: 94d349257b am: 7779d92cee -s ours

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

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

Change-Id: I33d518f23cdd0cc8cd0af72811d08d3b18fd6beb