[automerger skipped] Merge "NPE from bMessage MIME parsing crashes BT" into...

[automerger skipped] Merge "NPE from bMessage MIME parsing crashes BT" into rvc-dev am: 710f5c58 am: 1731255c -s ours am: c1a65bdf -s ours

am skip reason: Change-Id I9c2907d6fc42594382cc1eebdf0bcd49cdc44cac with SHA-1 841594d2 is in history

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

Change-Id: I9c65474b962cacc910026017382edc8da87c380f