[automerger skipped] Merge "Pbap use profileConnector, resolveSystemService...

[automerger skipped] Merge "Pbap use profileConnector, resolveSystemService api fix" am: 28538a52 am: bb0bd844 am: b32555ca am: 1b91703c -s ours

am skip reason: Merged-In I838b910c633b3ca943fec01f3ccca466ff65f892 with SHA-1 aacad3c7 is already in history

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

Change-Id: I7607ce90b071d0391be635e071153040f48f936e