[automerger skipped] Merge "Add test for...

[automerger skipped] Merge "Add test for BluetoothMapContentObserver.handleContactListChanges" into tm-qpr-dev am: 389e64f5 -s ours

am skip reason: Merged-In I8aadfb49a701e052b6f4fe153a437846d93624f4 with SHA-1 607ca7f8 is already in history

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



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