[automerger skipped] Merge "Duplicate MAP Message intent for non-default sms...

[automerger skipped] Merge "Duplicate MAP Message intent for non-default sms receiver packages." into tm-mainline-prod am: 65aa2db7 -s ours

am skip reason: Merged-In I7977d18509d0a8af0fc8543c98ee5bac6a376580 with SHA-1 7b6f632d is already in history

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



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