[automerger skipped] Merge "Add additional tests for setter methods in BluetoothMapContent" into tm-qpr-dev am: 3c28736c -s ours

am skip reason: Merged-In I296af212cf2c800f333290be6603837d87dff2d6 with SHA-1 04a80f03 is already in history

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



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