[automerger skipped] Merge "Add logs to debug MapClientTest failure" into...

[automerger skipped] Merge "Add logs to debug MapClientTest failure" into tm-qpr-dev am: 8603f6fa am: 09f345f2 -s ours

am skip reason: Merged-In Id30ca695574e0605393e8a79fa67a80894884a4a with SHA-1 ccca06ba is already in history

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



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