[automerger skipped] Merge "Add MapContactTest and SmsMmsContactsTest" into...

[automerger skipped] Merge "Add MapContactTest and SmsMmsContactsTest" into tm-qpr-dev am: e5cef0f1 -s ours am: 4d1e1829 -s ours

am skip reason: Merged-In I4134597295f16d65f4b2af07c3c2f52a68524862 with SHA-1 e79cd4d6 is already in history

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



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