[automerger skipped] Merge "Add ConvoContactInfoTest" into tm-qpr-dev am:...

[automerger skipped] Merge "Add ConvoContactInfoTest" into tm-qpr-dev am: af20de61 am: 4413479f -s ours

am skip reason: Merged-In I9a5348cf9a812aabc043c45c9fd1736a912c5f91 with SHA-1 8e160740 is already in history

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



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