am 79270566: (-s ours) 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 '79270566b178ed7efc1c62f8410822d46d6e3152'

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