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

am skip reason: Merged-In I296af212cf2c800f333290be6603837d87dff2d6 with SHA-1 12bc1ab5 is already in history

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



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