[automerger skipped] Merge "Add test for convoListing function in...

[automerger skipped] Merge "Add test for convoListing function in BluetoothMapContent" into tm-qpr-dev am: 0da606c7 -s ours

am skip reason: Merged-In I15cd8bb116bb637995dcf8806ac42c757e8aa193 with SHA-1 6c33cc44 is already in history

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



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