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

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

Change-Id: I9be07e4dd2ed8dfe44d29c399696c4f3a9c1dde7