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

[automerger skipped] Merge "Add more tests for BluetoothMapContentObserver" into tm-qpr-dev am: a4126365 -s ours am: 4a3ec0e6 -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: I4fdde93e0ddc830aded677d11ff919405a3c2e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>