tree 9b691bb8c700a0f04e4c4eaf823414509399d340
parent 8dfba713ac555cf5bf49ad896ecb950c9c208e01
parent fff729397acfc31f666ffbcaf3ecfac2a1d4d31f
author Treehugger Robot <treehugger-gerrit@google.com> 1640050077 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640050077 +0000

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