Merge "Switch VCardParser version if it doesn't match vCard version" into main...

Merge "Switch VCardParser version if it doesn't match vCard version" into main am: 7c32a210 am: 8e62aec2 am: 91dc7b94

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



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