[automerger skipped] Merge "Add a few BluetoothMapServiceTest methods" into...

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

am skip reason: Merged-In Ib12fba3b20a99e15826002c8011d553187d2555d with SHA-1 2db964a5 is already in history

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



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