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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c02f6a18c524021d623d9a8b93ee37db8ce0a1