[automerger skipped] Merge "Fix long characteristic write concurrency bug." am: 802b930d am: 284b3972 -s ours

am skip reason: Merged-In I8c017d2016c9596948bf5eb27f152284b3d375e3 with SHA-1 d491620a is already in history

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

Change-Id: Icf87e6f3ab630a3d8795d2bedfde6c57744bdbf4