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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie52a566882c8647c0f63ebeb39ae03915ffd603f