[automerger skipped] Merge "BtMapSettingsTest: Check BluetoothMapService is...

[automerger skipped] Merge "BtMapSettingsTest: Check BluetoothMapService is enabled" into tm-qpr-dev am: 437cc3c6 -s ours

am skip reason: Merged-In I7958651ce7fc0d343e984eee85077ff4679757d4 with SHA-1 8243d3d1 is already in history

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



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