Merge "Fix MMS returns Bad Request" am: 801aaf2189

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id03c42d3115b6d7fdee997c14532c47cc8228c8d