[automerger skipped] Merge "Add BluetoothMapSettingsTest" into tm-qpr-dev am: d3325dda am: 01c31d92 -s ours

am skip reason: Merged-In I692e91cda06709ff106536ad7db8e40c5849da17 with SHA-1 6bd31467 is already in history

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



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