[automerger skipped] Add MapContactTest and SmsMmsContactsTest am: ae932ebf -s ours am: 6361eee8 -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: Ida44d7e3d574bae983739ca1454f33d1b014a121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>