[automerger skipped] Merge "Fix failing BluetoothPbapSimVcardManagerTest" into...

[automerger skipped] Merge "Fix failing BluetoothPbapSimVcardManagerTest" into tm-qpr-dev am: 3a1d7f97 am: d40c19cf -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: Ic0862c6f15696677165073ccaa2bac09e4aeabdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>