Merge "Reduce blocking time when waiting for CharacteristicWrite queue to clear up." am: d5bd847275 am: c460086312 am: 33d0f3b417

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

Change-Id: I0503489731fdf2cb4675e553eaaa62d58c2cf2a2