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

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

Change-Id: I7ac0900a6c5ff5dfc9e93929a72e0e1bd6a6cbd0