[automerger skipped] Merge "Add a few BluetoothMapServiceTest methods" into tm-qpr-dev am: e6d56aaf am: a8460469 -s ours

am skip reason: Merged-In Ib12fba3b20a99e15826002c8011d553187d2555d with SHA-1 39ff12c2 is already in history

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



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