Merge "Introduce hasCompanionInCallServiceAccess API" am: 83cc1b62f0 am: 8a37624fe2

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

Change-Id: I493dfbde9d9c21df783a4f2efcb7710281530e54