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

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

Change-Id: I9fdccd3ed68c5090c1322d1a6e43753a15b9a6d1