Merge "MapClient disconnect timeout" am: f56cb92434

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5aafa041a50e2b3cc22137c817ec3dc615580ea