[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 am: 4f3fa4af am: d3ddaffc -s ours

am skip reason: Change-Id I9c2907d6fc42594382cc1eebdf0bcd49cdc44cac with SHA-1 23ce5469 is in history

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

Change-Id: I7b951884da9284d00b129cd33c71cc68426730ae