[automerger skipped] Merge "Add BluetoothMap(Email|IM)ProviderTest" into...

[automerger skipped] Merge "Add BluetoothMap(Email|IM)ProviderTest" into tm-qpr-dev am: 6921b94e -s ours

am skip reason: Merged-In If6b8c914b35e57d7a97186b9085dbf1ba9afb1c0 with SHA-1 d426bcb1 is already in history

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



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