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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9af4cfdc3e1ab67d2aa2bb5fc918c3333c80c3f