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

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

am skip reason: Merged-In I8aadfb49a701e052b6f4fe153a437846d93624f4 with SHA-1 05333df8 is already in history

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



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