[automerger skipped] Merge "Add tests for setter methods in...

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

am skip reason: Merged-In Ia9c7d0cf0e7ccce73564404df6aed40ae3251fac with SHA-1 59b14b44 is already in history

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



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