Merge "Merge "NPE from bMessage MIME parsing crashes BT" am: 45bf5774 am:...

Merge "Merge "NPE from bMessage MIME parsing crashes BT" am: 45bf5774 am: e7afb95d" into rvc-dev-plus-aosp am: 517a5897 am: 9853463e am: f16ddfa8

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

Change-Id: I0711e02fae1a3097ce7adb7c6ddd7ed9f99537a7