[automerger skipped] Merge "Add tests for BluetoothPbapSimVcardManager (2/2)"...

[automerger skipped] Merge "Add tests for BluetoothPbapSimVcardManager (2/2)" am: f52e62c5 -s ours am: 8ac838c2 -s ours

am skip reason: Merged-In If90c5b7767011ea96300ffd33349d1e342d16cf8 with SHA-1 16fde485 is already in history

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



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