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

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

Change-Id: I6d280552480c4fd6c07ee6553666c2551068a76f