[automerger skipped] Merge "Add BluetoothMapUtilsTest" into tm-qpr-dev am: 1b079306 am: e4cf539d -s ours

am skip reason: Merged-In I2d83055c8a0cdcc8ca528af3df0b899d62b71212 with SHA-1 3b28cf82 is already in history

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



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