[automerger skipped] Merge "Add tests for BluetoothMapContentObserverTest"...

[automerger skipped] Merge "Add tests for BluetoothMapContentObserverTest" into tm-qpr-dev am: 270ba2b1 -s ours am: eedca29a -s ours

am skip reason: Merged-In I89f16b5064a65a86eb2ed547a55574b62290c1f5 with SHA-1 96a49f63 is already in history

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



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