am d9d8ef26: Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair

Merge commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722' into eclair-plus-aosp

* commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722':
  b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE