[automerger skipped] Merge "Add BluetoothPbapAuthenticatorTest" am: e20c4024...

[automerger skipped] Merge "Add BluetoothPbapAuthenticatorTest" am: e20c4024 -s ours am: 7b65c319 -s ours am: 267934fb -s ours am: 2ea35c03 -s ours am: e3ee83b1 -s ours

am skip reason: Merged-In Id32750b5234f89805a954ff7cace23246206c850 with SHA-1 4ef20647 is already in history

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



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