Merge "Duplicate MAP Message intent for non-default sms receiver packages." am: 0a410458

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



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