[automerger skipped] Merge "Add additional tests for BluetoothMapContent" into...

[automerger skipped] Merge "Add additional tests for BluetoothMapContent" into tm-qpr-dev am: 67211bf7 -s ours am: 13bbc022 -s ours

am skip reason: Merged-In I90dfb8faa8ddb0b5865fdb759cd1228c0f896539 with SHA-1 c964cd37 is already in history

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



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