Merge "MapClient disconnect timeout" am: f56cb92434 am: 05b489a2ff am: c845700f25

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ce3c0d26ea003a09bc8fefe4aba88833f1642c