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

Merge "[automerger skipped] Merge "NPE from bMessage MIME parsing crashes BT" into rvc-dev am: c471a043 am: 4f3fa4af -s ours am: b1e3f40e -s ours" into rvc-qpr-dev-plus-aosp am: 4f7640f5 -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: Ibd9fdd093183f1fec4031d24ad1d85b96db2b6a0