[automerger skipped] Merge "Add tests for BluetoothMapContent and...

[automerger skipped] Merge "Add tests for BluetoothMapContent and BluetoothMapObexServer" into tm-qpr-dev am: d0792c91 -s ours

am skip reason: Merged-In I0feb02fa32c6d567a9d1500b8ca235eeafa4d1b4 with SHA-1 17a00c98 is already in history

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



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