[automerger skipped] Fix failing BluetoothPbapSimVcardManagerTest am:...

[automerger skipped] Fix failing BluetoothPbapSimVcardManagerTest am: 1f252200 -s ours am: 54a48a08 -s ours

am skip reason: Merged-In I4a8f3fd9e2a18ba1e626febef0e0ef3588e5f835 with SHA-1 07d25029 is already in history

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



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