[automerger skipped] Merge "Add more tests for BluetoothMapContentObserver"...

[automerger skipped] Merge "Add more tests for BluetoothMapContentObserver" into tm-qpr-dev am: a4126365 am: 3ed4c309 -s ours

am skip reason: Merged-In I0f69178648fc2998532a1bfd1946145ffd5f08e6 with SHA-1 afb03186 is already in history

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



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