Merge "MAP: Skip invalid message data" am: 6aaf1023b0 am: 1ff6caa103

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63efdef491533bb598dcf9e03baee07158013973