[automerger skipped] Merge "Add tests for message getters in BluetoothMapContent" into tm-qpr-dev am: fc481abf am: 48563f31 -s ours

am skip reason: Merged-In I533db15ac1044b9236fec14689e160ca13d78b6d with SHA-1 96d96674 is already in history

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



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