Merge "Pbap use profileConnector, resolveSystemService api fix"