Merge "MapClient parse bad messages" am: f77621cf47 am: 69932bff8e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccfcef9d88409d2d519ead1244063a359d324277