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

[automerger skipped] Merge "Fix long characteristic write concurrency bug." into sc-dev-plus-aosp am: dad2385d am: fb6f5ac6 -s ours

am skip reason: Merged-In I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1 with SHA-1 3fd335f4 is already in history

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

Change-Id: I63417b2e202c69c5ae6f0a0fcea20f863325b021