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

[automerger skipped] Merge "Add BluetoothPbapAuthenticatorTest" am: e20c4024 -s ours am: 7b65c319 -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: Ib2e3b5aef3bae98c396cfdb2bdd07619c0c99922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>