[automerger skipped] Merge "Add tests for BluetoothMapAccountItemTest and...

[automerger skipped] Merge "Add tests for BluetoothMapAccountItemTest and BluetoothMapAppParamsTest" into tm-qpr-dev am: cf9f6e84 -s ours am: 1b48126a -s ours

am skip reason: Merged-In I53c0104e967a8b50a464a5e5b060166a2a28ef25 with SHA-1 b601c4dd is already in history

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



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