[automerger skipped] Merge "Fix long characteristic write concurrency bug."...

[automerger skipped] Merge "Fix long characteristic write concurrency bug." am: cfa6f144 am: 4422794e -s ours am: f5aa7cbc -s ours am: 53b9baf6 -s ours

am skip reason: Merged-In I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1 with SHA-1 37343d1d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1752680

Change-Id: Ic11e09d480e6f92c9fb31b3c6195503480b3e765