[automerger skipped] Merge "Add PbapClientServiceTest" into tm-qpr-dev am: f449d647 -s ours am: cd0f8ab4 -s ours

am skip reason: Merged-In I6c80d67b8fb973476420a08f6ce1a6d09947601d with SHA-1 98771679 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20783568



Change-Id: Ie9e13e4c6643c19a775dab5280b54ed998300f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>