[automerger skipped] Merge "MapClientServiceTest: Fix wrong intent action in...

[automerger skipped] Merge "MapClientServiceTest: Fix wrong intent action in test" into tm-qpr-dev am: f352b257 am: 82bc1bff -s ours

am skip reason: Merged-In Id21783fc3073a67139225bb569fb8e9571c7954e with SHA-1 fd6d69d7 is already in history

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



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