[automerger skipped] Merge "Add MsgTest and additional tests to...

[automerger skipped] Merge "Add MsgTest and additional tests to BluetoothMapContentObserverTest" into tm-qpr-dev am: 446553ae -s ours

am skip reason: Merged-In I3bca6240a43afed735cc84d99e9c5affd44f7880 with SHA-1 f47c0ea4 is already in history

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



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