[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: c471a043 -s ours am: 6412073a -s ours am: 12eac112 -s ours am: 8a6f540a -s ours

am skip reason: Change-Id I9c2907d6fc42594382cc1eebdf0bcd49cdc44cac with SHA-1 324be55f is in history

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

Change-Id: I5f4e5b76036f3fa987b8d69b3056e42505e188ae