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

[automerger skipped] Merge "Add additional tests for BluetoothMapContentObserver" into tm-qpr-dev am: c35f93f7 -s ours

am skip reason: Merged-In Id523e1a678fa6b60cf834732f10acda9d90ca9ce with SHA-1 90f9fbc7 is already in history

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



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