[automerger skipped] Merge "Fix MapClientTest#testConnect" into tm-qpr-dev am: d7ffa0a3 -s ours

am skip reason: Merged-In Ib9da20e0b00c23345b892f6eec680d2b44972349 with SHA-1 6fde1b21 is already in history

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



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