[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 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: Ia3ba949afa95171f88c4160ccbb1277d7ab82e2e