[automerger skipped] Merge "MAP Client: Cleanup fails in some instances" into sc-dev am: e7c5ac9a -s ours

am skip reason: Merged-In Ib961049cde2e38c4ba066340f51760ebb43a4e27 with SHA-1 b3eb9cd6 is already in history

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

Change-Id: I1ab0502ab07b1e70c1888707b13c012f6260d538