Merge "MAP: Fix MAP disconnect" am: 89a290d02a

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

Change-Id: I9955a7807a4b3c4afa318d9daf02b19a2a8dac85