[automerger skipped] Merge "Enable the Pbap Client authenticator" am:...

[automerger skipped] Merge "Enable the Pbap Client authenticator" am: 256ec664 am: 4268f091 -s ours am: b119c043 -s ours am: 9f5101aa -s ours

am skip reason: Merged-In If0af12607dbb7a910013f4d9171b70662f0e6319 with SHA-1 08c43412 is already in history

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



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