[automerger skipped] Merge "Add MapClientServiceTest" into tm-qpr-dev am:...

[automerger skipped] Merge "Add MapClientServiceTest" into tm-qpr-dev am: 8df00d85 -s ours am: f279216c -s ours

am skip reason: Merged-In I212a7ead80ed2a289293b480862668f733828d2e with SHA-1 cc75d744 is already in history

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



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