Merge "Pbap use profileConnector, resolveSystemService api fix" am: 4548fa7275 am: fff729397a am: 4296ee7d71

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

Change-Id: Iee2f42ccdf2e69baf7f02ec453875477df9aca20