[automerger skipped] Merge "Add MapClientServiceBinderTest" into tm-qpr-dev...

[automerger skipped] Merge "Add MapClientServiceBinderTest" into tm-qpr-dev am: 513cce11 -s ours am: 896d9b87 -s ours

am skip reason: Merged-In I2535d7115a3fb27f3c94e2e2efdcada121682194 with SHA-1 08673148 is already in history

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



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