[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 -s ours am: 7a2924a8 -s ours

am skip reason: Change-Id I9c2907d6fc42594382cc1eebdf0bcd49cdc44cac with SHA-1 9212621b is in history

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

Change-Id: Idc7eea1bbe141898bd87cbaedc61c0772a12f03f